Auto merge of #2531 - alexcrichton:fix-stdin, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 30 Mar 2016 00:43:41 +0000 (17:43 -0700)
committerbors <bors@rust-lang.org>
Wed, 30 Mar 2016 00:43:41 +0000 (17:43 -0700)
Update Rust to pick up rust-lang/rust#32257

Closes #2530


Trivial merge